Ugh. Don't try to free ints, even if they're stored in pointers.

Mon Feb  9 22:22:19 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
	Ugh. Don't try to free ints, even if they're stored in pointers.

diff --git a/ChangeLog b/ChangeLog
index 9af02934372ac85c1e928d12f226b307748a0b35..4001085c9b83eabcbc701a9a84ec2cce5e8d5246 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb  9 22:22:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
+       Ugh. Don't try to free ints, even if they're stored in pointers.
+
 2004-02-09  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132256.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9af02934372ac85c1e928d12f226b307748a0b35..4001085c9b83eabcbc701a9a84ec2cce5e8d5246 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Feb  9 22:22:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
+       Ugh. Don't try to free ints, even if they're stored in pointers.
+
 2004-02-09  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132256.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9af02934372ac85c1e928d12f226b307748a0b35..4001085c9b83eabcbc701a9a84ec2cce5e8d5246 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Feb  9 22:22:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
+       Ugh. Don't try to free ints, even if they're stored in pointers.
+
 2004-02-09  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132256.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9af02934372ac85c1e928d12f226b307748a0b35..4001085c9b83eabcbc701a9a84ec2cce5e8d5246 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Feb  9 22:22:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
+       Ugh. Don't try to free ints, even if they're stored in pointers.
+
 2004-02-09  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132256.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9af02934372ac85c1e928d12f226b307748a0b35..4001085c9b83eabcbc701a9a84ec2cce5e8d5246 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Feb  9 22:22:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
+       Ugh. Don't try to free ints, even if they're stored in pointers.
+
 2004-02-09  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132256.

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index f7bb9dcba48a690913ec3bf4233c7c789a444d82..d5a6e561f3f5a5c79972659bf12db6a26b50445c 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -682,6 +682,7 @@ gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout   *layout,
 {
   GtkCellViewCellInfo *info;
   GtkCellView *cellview = GTK_CELL_VIEW (layout);
+  GSList *list;
 
   g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
   g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
@@ -689,7 +690,13 @@ gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout   *layout,
   info = gtk_cell_view_get_cell_info (cellview, renderer);
   g_return_if_fail (info != NULL);
 
-  g_slist_foreach (info->attributes, (GFunc)g_free, NULL);
+  list = info->attributes;
+  while (list && list->next)
+    {
+      g_free (list->data);
+      list = list->next->next;
+    }
+
   g_slist_free (info->attributes);
   info->attributes = NULL;
 }